Various fixes and improvements. Still a long way to go :)
Merge pull request #1 from stefanceriu/master

Various fixes and improvements. Still a long way to go :)