container: closes #43