Merge pull request #16 from EricWittmann/master

Prepare for M3 release