Commits from Pull#27 (Chaossama)

slightly cleaned up the syntax.