Merge pull request #16 from jovan-s/master

Reviewed.