Merge remote-tracking branch 'alchemythreadgist/master'
Merge remote-tracking branch 'upstream/master'
removed diff file
Added in changes from gist 4199234
Merge pull #55