AnalogJ Merge pull request #3 from maab/master