Updated. Look at issue #1 and #2.