issue #1 - Use 1.6 code style in source code