Fixed issues
Merge branch 'master' of https://github.com/Zaixu/Runup