some fixes and improvements
Merge pull request #28 from conejoninja/master

some fixes and improvements