Merge pull request #208 from topilski/master

Fix bugs new step