final changes before pull to master
Merge pull request #25 from lilfade/dev

final changes before pull to origin:master