Code improvements  + cleanup
Merge pull request #96 from mshamash/master

Code improvements  + cleanup