Merge pull request #11 from mladenw/master

Sync with Master