Bugfix #12

Fix for issue  #12 

Sorry for the whitespace changes - android studio decided to have a wacky redo shortcut (Ctl-Shift-Z ???) and auto saves files - grrr.  Add &w=1 to the github URL to diff ignoring whitespace changes.