Merge pull request #32 from mladenw/master

sync with master