Added some great functionality!
Merge branch 'Þór'