Completed

private project for dbrunettin #3