Few bugs fixed
Revert "Few bugs fixed"

This reverts commit f17d27c372229bc4dcc7fd8b8cbc6bc7ec428eb1.
Few bugs fixed
Merge pull request #3 from hrasekj/fewChanges

Fix #1 #2