Renamed the helper module, fixed some bugs with double checking
Merge remote-tracking branch 'origin/master'