merge dis pelasepalse

http://nshipster.com/at-compiler-directives/#properties