Merge pull request #1 from Nuand/master

General update