Merge pull request #14 from manolo/master

Last changes on manolo's branch