Merge pr#74 from sir-trevor-js into master