Added master
Merge pull request #16 from isflorin/dev

Added master