some fixes
Merge pull request #2 from liuggio/master

some fixes