diff --git a/application/controllers/results.php b/application/controllers/results.php
index f725f0e..63ab8ee 100644
--- a/application/controllers/results.php
+++ b/application/controllers/results.php
@@ -87,8 +87,14 @@ class Results extends MY_Controller {
 	 * Downloads the results of a given experiment.
 	 *
 	 * @param string $experimentId
+	 * @param string $what
 	 */
-	public function download($experimentId = '') {
+	public function download($experimentId = '', $what = 'out') {
+
+		// only allow download of specific files
+		if(!in_array($what, array('out', 'tma', 'log')))
+			show_404();
+
 		$job = $this->job->getByExperimentId($experimentId);
 		if (empty($experimentId) || !$job) {
 			show_404();
@@ -98,12 +104,12 @@ class Results extends MY_Controller {
 
 		$path = FCPATH.'uploads/'.$experiment['project_id'].'/'.$experiment['id'].'/';
 
-		if (file_exists($path.'default.out')) {
+		if (file_exists($path.'default.'.$what)) {
 			// load download helper
 			$this->load->helper('download');
 			// download the file
-			$data = file_get_contents($path.'default.out');
-			force_download('default.out', $data);
+			$data = file_get_contents($path.'default.'.$what);
+			force_download('default.'.$what, $data);
 		}
 	}
 }
diff --git a/application/views/results/experiment.php b/application/views/results/experiment.php
index 522d917..21dd3d4 100644
--- a/application/views/results/experiment.php
+++ b/application/views/results/experiment.php
@@ -11,7 +11,8 @@
 	if (count($results) > 0):
 ?>
 		<p>
-			<a href="<?=site_url('results/download/'.$experiment['id']);?>" class="button download"><?=_('Download');?></a>
+		<h4>Downloads results</h4>
+			<a href="<?=site_url('results/download/'.$experiment['id']).'/out';?>" class="button left download"><?=_('Results (.out)');?></a><a href="<?=site_url('results/download/'.$experiment['id']).'/tma';?>" class="button middle download"><?=_('T-Matrix (.tma)');?></a><a href="<?=site_url('results/download/'.$experiment['id']).'/log';?>" class="button right download"><?=_('Application output (.log)');?></a>
 		</p>
 <?php
 	endif;