Merge pull request #1 from jordanatlas/master

Getting jordan's changes.