Finished
Merged SJs stuff
Merge pull request #3 from cyrus-/master

asdf