2014.1.7
Merge pull request #65 from Robert-Lwf/master

2014.1.7