Merge pull request #2 from deebost/foo

Foo bar
More minor cleanup.
Merge remote-tracking branch 'dan/master'
More minor cleanup
additional NSLog entered
Merge pull request #3 from jhaybie/master

additional NSLog entered