reverted to 87c0797cc91bd619bdacd98fa6ba5b372b6fa697
Merge pull request #69 from combats/developTest

reverted to 87c0797cc91bd619bdacd98fa6ba5b372b6fa697