Merge pull request #7 from pistruiatul/master

Keep in sync