Merge pull request #48 from bostak/bostak

Bostak