skulpt:master pull request

update my fork from the skulpt:master