Merge pull request #283 from XhmikosR/develop

Cleanup and stuff
Update dependencies to their latest versions.