some enhancements added
Merge branch 'master' of https://github.com/aheinze/Lime

Conflicts:
	Lime.php
structure refactored