Merge pull request #12 from XhmikosR/master

Update dependencies and minor cleanup