YAY BUG fixes #7 partially

http://github.com/ambrosechua/Youpp/issues/7#issuecomment-49308466