Support Nexus 2.3

Also fixes:

#17 
#15