Merge pull request #61 from ifreecarve/master

Reliability fixes & JavaScript style cleanup