Blu3wolf Merge pull request #73 from dreadicon/develop