solve issue #61, #62
merge for gh-pages build