Things ar eworking, despite JAVA
Merge remote-tracking branch 'aaron/master'