Merge pull request #5 from netceler/master

Some code cleaning