Kevin - 2014-09-23 night
Merge pull request #111 from kevin000/master

Kevin - 2014-09-23 night