nanglin/githubtest — pull request #3 by nanglin (2014-02-06 10:17:36+00:00)
Title: Merge

Merge with master and rhawunna branch