Unknown selector warning fix, cleanup
Code cleanup
Merge pull request #9 from skluev/master

Unknown selector warning fix