Merge pull request #13 from mladenw/master

Master Sync