null check for getComputedStyle, fixed #1
Merge branch 'development'