container: closes #34