fixes and RC
Merge pull request #3 from liuggio/master

fixes seems like a RC