Merge pull request #249 from ddeconinck/master

my awesome changes