Merge pull request #815 from Amrykid/dev

'Dev' branch stuff.