Merge pull request #4 from UnCommitted/master

Merged in working version from hpc