Fix #70 issue
Merge pull request #89 from Koc/fix-container-rebuilding

Fix #70 issue