Yi_9_Dec
Merge branch 'master' of https://github.com/tripalocal/version-1.0

Initial upload by Yi on 9 Dec 2014