2014.1.2
Merge pull request #55 from Robert-Lwf/master

2014.1.2