Updated to match the latest status in M40
Merge pull request #16 from KenjiBaheux/m40-20141024

Updated to match the latest status in M40