Merge pull request #14 from arit-ucsb/dev

@apasko says it's good to go!