Merge pull request #44 from bostak/bostak

Bostak