Merge pull request #35 from euromake/bug17

Align to IEEE 1003.1-2013 + Aardvark 735-737