disc parsing added
Merge branch 'develop' of https://github.com/Metalcon/bootstrap into develop