Add Julian's changes
Merge pull request #18 from madevr/master

Add Julian's changes