Merge pull request #9 from gelnicproduction/master

Wed Sep 18 17:35:29 CST 2013 800ts modification