Random modifications
Merge pull request #4 from lesmon/master

Random modifications