Fixed some bugs and added some enhancements
Merge pull request #1 from aldolat/master

Added some enhancements from @aldolat